<<<<<<< HEAD
<?php 


 //商品控制器
 

 class GoodsController extends Controller
 {
 	public function index()
 	{
 		echo '我是商品首页!';
 	}
 	public function add()
 	{
 		echo 'goods -- add';
 	}
 	public function edit()
 	{
 		echo 'goods -- edit';
 	}
 } 
=======
<?php 

/**
 * 商品控制器
 */

class GoodsController extends Controller
{
    public function index()
    {
        echo 'Goods---index';
    }
    public function  add()
    {
         echo 'goods -- add';
    }
    public function  edit()
    {
         echo 'goods -- edit';
    }
}


>>>>>>> eef4ccab5e2365653ce82c8c2cc6fa18cd04e6c3
